Tweak focus tests

These tests are a bit fragile because the initial focus
that is taken depends on what ends up in the center of
the window, horizontally or vertically, which depends
on things like fonts, or theme spacing.

This commit makes some tweaks to push things in the
widget-factory example around far enough to make the
tests work again.

We should figure out a way to make this more robust.

diff --git a/testsuite/gtk/focus-chain/widget-factory.ui b/testsuite/gtk/focus-chain/widget-factory.ui
index f3aa01b9fe3b8b86e14b8bb78ea814f5ec60cb6c..b5e1898497aebe8aafdbacbb85fd461ddc311694 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory.ui
+++ b/testsuite/gtk/focus-chain/widget-factory.ui
@@ -847,7 +847,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkFontButton" id="fontbutton1">
                                 <property name="receives-default">1</property>
-                                <property name="level">family|style|size|features|variations</property>
+                                <property name="level">family|size|features|variations</property>
                               </object>
                             </child>
                             <child>
@@ -1013,7 +1013,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">end</property>
                                       </object>
@@ -1026,7 +1026,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">start</property>
                                       </object>
@@ -1081,7 +1081,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </style>
                                 <child type="label">
                                   <object class="GtkLabel" id="label17">
-                                    <property name="label" translatable="yes">&lt;b&gt;Groove&lt;/b&gt;</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Groove, Groove, Groove&lt;/b&gt;</property>
                                     <property name="use-markup">1</property>
                                   </object>
                                 </child>

diff --git a/testsuite/gtk/focus-chain/widget-factory2.ui b/testsuite/gtk/focus-chain/widget-factory2.ui
index 3f5c3bb0d38572494b7cd5a9f62f6d7825e1c4b0..df73b1f6425a8c64601065acdae2dd800b796a4b 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory2.ui
+++ b/testsuite/gtk/focus-chain/widget-factory2.ui
@@ -1014,7 +1014,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">end</property>
                                       </object>
@@ -1027,7 +1027,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">start</property>
                                       </object>

diff --git a/testsuite/gtk/focus-chain/widget-factory3.ui b/testsuite/gtk/focus-chain/widget-factory3.ui
index de944471efb2f1c960488b9b4ab3cb8767bd0ef9..8b0a159418d621b442e0f3808a3efe6a09498618 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory3.ui
+++ b/testsuite/gtk/focus-chain/widget-factory3.ui
@@ -1014,7 +1014,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">end</property>
                                       </object>
@@ -1027,7 +1027,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">start</property>
                                       </object>